Merge branch 'release/1.2.22' v1.2.22
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 13 Apr 2017 17:40:15 +0000 (13:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 13 Apr 2017 17:40:15 +0000 (13:40 -0400)

Trivial merge