Merge tag 'v1.0.21' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 7 Jul 2016 20:16:10 +0000 (16:16 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 7 Jul 2016 20:16:10 +0000 (16:16 -0400)
version 1.0.21


Trivial merge