Merge pull request #720 from s0undt3ch/develop

Fix double layer outputter bug introduced in 25512be by me.
Event firing changes for the upcoming salt `0.17.0`. Handle the change.