Merge tag 'v1.0.20' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 9 Mar 2016 15:48:02 +0000 (10:48 -0500)
committerIan Weller <ian@gaslightmedia.com>
Wed, 9 Mar 2016 15:48:02 +0000 (10:48 -0500)
version 1.0.20


Trivial merge