Merge branch 'hotfix/1.1.3' v1.1.3
authorAnthony Talarico <talarico@gaslightmedia.com>
Mon, 21 Mar 2016 13:08:43 +0000 (09:08 -0400)
committerAnthony Talarico <talarico@gaslightmedia.com>
Mon, 21 Mar 2016 13:08:43 +0000 (09:08 -0400)

Trivial merge