Reconciling my undone bad fix with Matt's latest edits
Merge remote-tracking branch 'origin/master'