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


Trivial merge