Merge tag 'v1.2.14' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 8 Nov 2016 18:45:10 +0000 (13:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 8 Nov 2016 18:45:10 +0000 (13:45 -0500)
Version 1.2.14


Trivial merge