Merge branch 'hotfix/1.2.16' master
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 15:44:22 +0000 (10:44 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 15:44:22 +0000 (10:44 -0500)

Trivial merge