Merge branch 'hotfix/1.2.3' v1.2.3
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 20:16:33 +0000 (15:16 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 16 Dec 2016 20:16:33 +0000 (15:16 -0500)

Trivial merge