Merge pull request #857 from spbnick/move_trigger_include