Merge branch 'release/1.2.2' v1.2.2
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 19:44:38 +0000 (15:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 19:44:38 +0000 (15:44 -0400)

Trivial merge