Merge tag 'v1.1.6' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Aug 2014 17:08:03 +0000 (13:08 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 8 Aug 2014 17:08:03 +0000 (13:08 -0400)
Version 1.1.6


Trivial merge