This should work
Merge branch 'devjg'

merging with master