Bugs, Mr. Rico!

We're working on pushing the current release to completion. As a result, I'm not working on merges at the moment -- instead I'm digging through the mound of bugs that remain. As usual, things are just a bit behind. :)