Another try to merge the changes from dev1 into trunk.
Authored by: wellgis 2014-02-14
Parent: [r475]
Child: [r477]