Merge tag 'v1.1.5' into develop
authorIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 19:19:36 +0000 (15:19 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 19 May 2016 19:19:36 +0000 (15:19 -0400)
version 1.1.5


Trivial merge