Temp fix for issue #1120
Merge branch 'develop'