Merge branch 'hotfix/1.2.1' v1.2.1
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Mar 2015 17:07:51 +0000 (13:07 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 17 Mar 2015 17:07:51 +0000 (13:07 -0400)

Trivial merge