Merge branch 'hotfix/1.2.16' v1.2.16
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jul 2016 18:44:05 +0000 (14:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 7 Jul 2016 18:44:05 +0000 (14:44 -0400)

Trivial merge