Merge tag 'v1.2.14' into develop
authorIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 21:34:32 +0000 (16:34 -0500)
committerIan Weller <ian@gaslightmedia.com>
Tue, 27 Dec 2016 21:34:32 +0000 (16:34 -0500)
version 1.2.14


Trivial merge