Merged Sam's branch and compile error fixes (Feb 13, 2013 6:27 PM)