Merge tag '1.0.14' into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 22 May 2017 16:57:48 +0000 (12:57 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 22 May 2017 16:57:48 +0000 (12:57 -0400)
version 1.0.14


Trivial merge