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)
version 1.1.5


Trivial merge