Merge tag 'v1.1.14' into develop
authorIan Weller <ian@gaslightmedia.com>
Fri, 8 Jul 2016 18:05:39 +0000 (14:05 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 8 Jul 2016 18:05:39 +0000 (14:05 -0400)
version 1.1.14


Trivial merge