Merge tag 'v1.0.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:07:31 +0000 (09:07 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Mar 2016 14:07:31 +0000 (09:07 -0500)
v1.0.14


Trivial merge