Fix some nits from #364
Add a test that Renzo pointed out that we're missing
Resync with trunk
Fix a nit
Merge pull request #366 from peternewman/trivial-fixes

Fix some easy nits from #364 and add another missing RDM test