Merge tag 'v1.2.21' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 19:12:56 +0000 (14:12 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 29 Jan 2016 19:12:56 +0000 (14:12 -0500)
v1.2.21


Trivial merge