Merge tag 'v1.0.21' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 5 Feb 2016 17:18:10 +0000 (12:18 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 5 Feb 2016 17:18:10 +0000 (12:18 -0500)
v1.0.21


Trivial merge