Merge tag 'v1.2.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 19:44:46 +0000 (15:44 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 18 Mar 2015 19:44:46 +0000 (15:44 -0400)
Version 1.2.2


Trivial merge