Merge branch 'hotfix/1.2.22' v1.2.22
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 11:49:00 +0000 (07:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 29 Jul 2016 11:49:00 +0000 (07:49 -0400)

Trivial merge