Update for Rocketeer 2
Merge branch 'develop'