Merge branch 'hotfix/1.0.20' v1.0.20
authorIan Weller <ian@gaslightmedia.com>
Wed, 9 Mar 2016 15:47:15 +0000 (10:47 -0500)
committerIan Weller <ian@gaslightmedia.com>
Wed, 9 Mar 2016 15:47:15 +0000 (10:47 -0500)
commitb97a7d116e597bf3e085a8cd6f3fd9820d16b4b5
treec0d200fbd9c8c92871f603185241c11ddb72dda6
parentb4a66a094a9d49bf9fbd8452b31dc2518e3244ca
parenteadbe085520814ed8dbc59cf4842668b80a03f49
Merge branch 'hotfix/1.0.20'