Merge from jdong, XMLRPC changes and testcases

Benjamin Mako Hill || Want to submit a patch?