Merge branch 'hotfix/1.2.3' v1.2.3
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 16:13:43 +0000 (12:13 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 16:13:43 +0000 (12:13 -0400)

Trivial merge