Sync to development version, major changes during Fall 2013 semester