Merge branch 'release/1.2.2' v1.2.2
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 23 Oct 2015 12:25:25 +0000 (08:25 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 23 Oct 2015 12:25:25 +0000 (08:25 -0400)

Trivial merge