Merge branch 'hotfix/1.5.6' v1.5.6
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Jan 2017 17:27:26 +0000 (12:27 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 12 Jan 2017 17:27:26 +0000 (12:27 -0500)

Trivial merge