Merge branch 'release' into jungfrauv1.0

This commit is contained in:
Dhanya Maliakal 2016-02-03 15:00:53 +01:00
commit 615909f178