Merged my stash files with the latest sources. (completed)