Version 1.11.0, Revision 6
Merge branch 'dev'