Initial merge to sync local git with remote git.
Merge branch 'master' of github.com:Hovelander/Cinder

'Initial merge to sync local git with remote git'.