Merge in latest changes from MarcusCom SVN repo