Dev to master, Aug 16th

@sinker look good?