Morning merge

Why did I stay up all night last night when I have stuff piling-up? Ziji needs to get some sleep so that he makes wiser decisions about allocating his time (and stops speaking in the third-person).

Nevertheless, I still managed to crank out a few more commits today for your consumption in the morning merge and am holding back a series of further commits until I get some proper rest and other work done.

Time to go find myself a $3.65 pizza too and crash for as long as I can.  See you on the flip-side (HIP-side?).