Merge tag 'v1.1.5' into develop
authorIan Weller <ian@gaslightmedia.com>
Fri, 4 Nov 2016 14:26:21 +0000 (10:26 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 4 Nov 2016 14:26:21 +0000 (10:26 -0400)
commitce8bbcc1457dc1e8fb74c6f906e2243af9e8c642
treeafff28fc45813bab2e525be73f44d4d3d0587a0b
parent89fcb89076899d420ecf5cbd70cced6bfd42b6b4
parent47922f0c4e89a628dec4c9c61c8d8b4038ea1834
Merge tag 'v1.1.5' into develop

version 1.1.5