Update to new upstream.
Support GCC 4.6-4.9, rather than 4.6-4.7