Merge remote-tracking branch 'remotes/cinder/dev' into dev
Merge branch 'dev' of https://github.com/zulis/Cinder into dev