master sync (with new_mix code)

this should sync your master branch with mine.

(sending this from the airplane...)

Joon