Merge tag 'v1.1.16' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 18:47:21 +0000 (14:47 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Apr 2015 18:47:21 +0000 (14:47 -0400)
v1.1.16


Trivial merge