Merging unstable into master (prep for 1.5 release)