Merge tag 'V1.2.21' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 24 May 2017 17:17:21 +0000 (13:17 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 24 May 2017 17:17:21 +0000 (13:17 -0400)
v1.2.21


Trivial merge