Version 1.9.0, Revision 5
Merge branch 'dev'