Master merge - 1.0 RC

Review revisions individually for changelog. Changelog.txt will be added for 1.0 onwards.