Version 1.11.0, Revision 1
Merge branch 'dev'