Version 1.12.0, Revision 1
Merge branch 'dev'