Merge tag 'v2.0.10' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 3 Jun 2016 17:36:04 +0000 (13:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 3 Jun 2016 17:36:04 +0000 (13:36 -0400)
v2.0.10


Trivial merge