Update to working#1

stramzel wants to merge 2 commits intobdureau:masterbdureau/RocketTrack:masterfrom

stramzel:wip_update_to_workingstramzel/RocketTrack:wip_update_to_workingCopy head branch name to clipboard