Merge tag 'v1.0.20' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 19:05:18 +0000 (15:05 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 19:05:18 +0000 (15:05 -0400)
version 1.0.20


Trivial merge