Merge branch 'release/1.0.14' v1.0.14
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Mar 2016 21:01:42 +0000 (16:01 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 1 Mar 2016 21:01:42 +0000 (16:01 -0500)

Trivial merge