Merge branch 'developer' into jungfrautomerge

This commit is contained in:
Dhanya Maliakal
2016-11-02 14:33:03 +01:00