Merge branch 'next'
Merge branch 'next'
bump versions
Merge branch 'next'
Merge remote-tracking branch 'chriskite/master' into next