13072014-1648
Merge branch 'devel'
Revert "Merge branch 'devel'"

This reverts commit 2c6a9929d0a05bfa71c6e66f1dc0d202b558f34d, reversing
changes made to 63d2216df9d54bc7b612649fe568f8fbbea85deb.
Revert "Revert "Merge branch 'devel'""

This reverts commit ac9a1999196c2857259ebe0a50f9d8387678d2a4.
Merge branch 'master' into devel