Merge tag 'v1.0.22' into develop
authorIan Weller <ian@gaslightmedia.com>
Fri, 19 Feb 2016 19:40:54 +0000 (14:40 -0500)
committerIan Weller <ian@gaslightmedia.com>
Fri, 19 Feb 2016 19:40:54 +0000 (14:40 -0500)
version 1.0.22
s


Trivial merge