Version 1.11.0, Revision 4
Merge branch 'dev'