Merge branch 'hotfix/1.2.3' v1.2.3
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 18:11:03 +0000 (13:11 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Dec 2016 18:11:03 +0000 (13:11 -0500)

Trivial merge