Merge branch 'hotfix/1.5.10' v1.5.10
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 22 Dec 2016 20:00:59 +0000 (15:00 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 22 Dec 2016 20:00:59 +0000 (15:00 -0500)

Trivial merge