Merge remote-tracking branch 'origin/master' into PilotOne
Authored by: matsrogalski 2016-05-12
Parents: [ba3a60][ef9124]