Discussion Photos: patched so plugin does not run on table layouts.
merge:
Merge branch 'master' into stage