merged changes from master that were incorrectly rebasefd