Merge branches 'master' and 'salient_constraints'
Merge branch 'master' of github.com:ozzyoli/motion