Merge branch 'release/1.2.3' v1.2.3
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Oct 2015 12:56:25 +0000 (08:56 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Oct 2015 12:56:25 +0000 (08:56 -0400)

Trivial merge