Version 1.11.0, Revision 3
Merge branch 'dev'