Merge All The Things!

Because the three branches I pullreq'd won't cleanly merge together at once, I took the liberty of merging them for you.