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


Trivial merge