Merge remote-tracking branch 'origin/i532-partners'
Merge branch 'master' of github.com:f-me/carma