Merge tag 'v1.1.4' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Aug 2014 13:49:20 +0000 (09:49 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Aug 2014 13:49:20 +0000 (09:49 -0400)
Version 1.1.4


Trivial merge