fixed trigger bug introduced with commit b22beba
Merge branch 'stable'
Merge branch 'master' into next