Merge branch 'release' into jungfrauv1.0

This commit is contained in:
Dhanya Maliakal
2016-02-03 14:59:22 +01:00
9 changed files with 161 additions and 25 deletions