Pulled in some changes from the me495 branch.