Merge branch 'release/1.1.14' v1.1.14
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 16:03:03 +0000 (11:03 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Jan 2016 16:03:03 +0000 (11:03 -0500)

Trivial merge