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)
commit5c841f44f93b8f756ec43d62474c2f31879f5a1b
tree7792da7ace70d85a513aa1a2f4bdc3168a073389
parentc9e11ae2347debfb70082bd9cd74bc680f6e4bc5
parent1c624cec62d694c13173003886edcad6a04743d9
Merge tag 'v1.2.14' into develop

version 1.2.14