Merge branch 'hotfix/1.1.22' v1.1.22
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 3 Jan 2017 14:36:30 +0000 (09:36 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 3 Jan 2017 14:36:30 +0000 (09:36 -0500)

Trivial merge