Friday merge (20121212)

Recommitted due to shuffling of stuff.

* Bagus: 3791eb754c279cdbf162d24b61f4b769f448dd0c