Synch to development version. Preparation for Fall 2013 semester