Merge tag 'v1.2.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 23 Oct 2015 12:25:31 +0000 (08:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 23 Oct 2015 12:25:31 +0000 (08:25 -0400)
Version 1.2.2


Trivial merge