Merge branch 'release/1.0.14' 1.0.14
authorIan Weller <ian@gaslightmedia.com>
Mon, 22 May 2017 16:56:58 +0000 (12:56 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 22 May 2017 16:56:58 +0000 (12:56 -0400)

Trivial merge