Update to match current on master

Applies to https://github.com/GigaOM/gigaom/issues/4015