Merge official release into fork

I'm trying to merge changes developed by oskmeister, mcostalba, and lucasart into my fork.  If this request tries to do the opposite, please ignore it.