Incorporate dc42's latest changes into master