Merge branch 'release/1.1.6' into develop
Updates to the add_to_whatcounts.pl script; better logic for sending one-off messages
Merge branch 'develop'