Merging master to live to pick up Sam's changes.