merge back to master

pulling myself.