Merge branch 'hotfix/1.0.20' v1.0.20
authorChuck Scott <cscott@gaslightmedia.com>
Fri, 16 Jun 2017 19:52:50 +0000 (15:52 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Fri, 16 Jun 2017 19:52:50 +0000 (15:52 -0400)
commitddbf39f7b3e876dd180c2c860b1c2bace04fb809
tree4b33667f4051ccdb90056d4784368b400a7efbf2
parent0b996f7ea87de12d5a598068f263cc943b45c6b7
parentb914b07b931e328875d3a8309501f4c24ca989a5
Merge branch 'hotfix/1.0.20'