Upstream updates

Pulls in the upstream updates to our fork. @rupl @elliotttf 
This time not trying to push our changes upstream. Yay github fucking up.