Merge tag 'v1.1.14' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 16:09:46 +0000 (12:09 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 16:09:46 +0000 (12:09 -0400)
v1.1.14


Trivial merge