Merge tag 'v2.0.15' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Oct 2016 18:58:01 +0000 (14:58 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Oct 2016 18:58:01 +0000 (14:58 -0400)
v2.0.15


Trivial merge