Bringing the Dev up to date with the Master

See last Master commit for details.