Merge tag 'v1.1.15' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:19:00 +0000 (14:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 8 Jul 2016 18:19:00 +0000 (14:19 -0400)
v1.1.15


Trivial merge