Update Gemlock
Merge remote-tracking branch 'origin/master' into development#test_dev