[version] 1.12.0
Merge branch 'master' of http://sixion-fs/git/Caramel