Merge tag 'v1.0.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Mon, 9 Mar 2015 14:57:55 +0000 (10:57 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 9 Mar 2015 14:57:55 +0000 (10:57 -0400)
v1.0.14


Trivial merge