Merge tag 'v1.1.4' into develop
authorIan Weller <ian@gaslightmedia.com>
Wed, 1 Jun 2016 19:04:29 +0000 (15:04 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 1 Jun 2016 19:04:29 +0000 (15:04 -0400)
version 1.1.4


Trivial merge