Vuko Vukcevic - 2015-10-23

Please reject this request as I mistakenly requested merge to master (should be nextRelease).