Re apply 7fdbf, which was accidentally merged out
Merge pull request #39 from claco/reapply-notifysh-order

Re apply 7fdbf, which was accidentally merged out