Better image lock scopes
Merge branch 'workshop' of github.com:MrKepzie/Natron into workshop