Merge tag 'v1.1.5' into develop
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 16:51:40 +0000 (12:51 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 16:51:40 +0000 (12:51 -0400)
commitb1084d27b58c65324b2cc1f9687f65c8c9fb8674
tree33467228a8a55facc647be526867f77e6c07103b
parentc7e0608a50b9ac8575882dcafbe6050f5cb2ab3a
parent3a6b783f1da9940ff0f674dc5c5faeb8331ae584
Merge tag 'v1.1.5' into develop

v1.1.5