Merge branch 'develop' into develop-libqt4-unilib
Merge branch 'develop-libqt4-unilib' into develop-requests