push bdewar's fork back to master