Merge tag 'v2.0.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Fri, 28 Oct 2016 13:25:51 +0000 (09:25 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 28 Oct 2016 13:25:51 +0000 (09:25 -0400)
v2.0.14


Trivial merge