defensively fixed trigger recursion bug introduced with commit ea2d734, and ...

fixed updating pictures.last_modified
Merge branch 'stable' into next