Merge branch 'hotfix/1.2.14' v1.2.14
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 8 Nov 2016 18:45:00 +0000 (13:45 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 8 Nov 2016 18:45:00 +0000 (13:45 -0500)

Trivial merge