[[ Bug 13261 ]] Return modified lock area when locking pixels
[[ Bug 13261 ]] Update OSX stacksurface
Merge remote-tracking branch 'ian/bugfix-13261' into bugfix-13261
Merge branch 'bugfix-13261' into develop