Merge branch 'release/1.1.3' v1.1.3
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Feb 2016 18:43:06 +0000 (13:43 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 12 Feb 2016 18:43:06 +0000 (13:43 -0500)

Trivial merge