Merge branch 'release/1.6.22' v1.6.22
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 7 Mar 2017 18:06:40 +0000 (13:06 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 7 Mar 2017 18:06:40 +0000 (13:06 -0500)

Trivial merge