Merge branch 'release', remote branch 'origin' into release

This commit is contained in:
Dhanya Maliakal
2016-02-02 11:21:07 +01:00