Merge branch 'hotfix/1.2.3' v1.2.3
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 20:11:26 +0000 (16:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 20:11:26 +0000 (16:11 -0400)

Trivial merge