Version 1.12.2, Revision 3
Merge branch 'dev'