Merge branch 'release/1.0.22' v1.0.22
authorIan Weller <ian@gaslightmedia.com>
Fri, 19 Feb 2016 19:38:59 +0000 (14:38 -0500)
committerIan Weller <ian@gaslightmedia.com>
Fri, 19 Feb 2016 19:38:59 +0000 (14:38 -0500)

Trivial merge