Merge tag 'v1.0.15' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 9 Mar 2015 15:01:07 +0000 (11:01 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 9 Mar 2015 15:01:07 +0000 (11:01 -0400)
v1.0.15


Trivial merge