Merge tag 'v1.2.2' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 14:28:28 +0000 (10:28 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 16 Jun 2016 14:28:28 +0000 (10:28 -0400)
Version 1.2.2


Trivial merge