Merge branch 'hotfix/1.2.14' v1.2.14
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 21:34:03 +0000 (16:34 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 21:34:03 +0000 (16:34 -0500)

Trivial merge