Merge tag 'v1.5.21' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:27:21 +0000 (09:27 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 18 Apr 2016 13:27:21 +0000 (09:27 -0400)
v1.5.21


Trivial merge