Merge branch 'hotfix/1.2.16' v1.2.16
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 18:48:49 +0000 (13:48 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 18:48:49 +0000 (13:48 -0500)

Trivial merge