Dev to master, July 25

@sinker this look right?