Merge branch 'hotfix/1.1.18' v1.1.18
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:29:52 +0000 (16:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:29:52 +0000 (16:29 -0400)
commit712729b98e8cd5080ebeba8b71a3a2d9a3d43561
treebe89e76754fccbd47dcb3c576ff33e8b5265a53c
parentf5122dd5d33d16606588e6f8eaaead60d9feae6e
parentd79a51d50be61e40ada8c2971909bfff739cef1c
Merge branch 'hotfix/1.1.18'