Merge unstable into testing

Ready for testing - relatively stable.