Merge tag 'v1.1.5' into develop
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Aug 2014 14:06:44 +0000 (10:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 15 Aug 2014 14:06:44 +0000 (10:06 -0400)
Version 1.1.5


Trivial merge