Latest as of 9-23-2013

Last seven commits included in this pull request (up-to-date as of September 23, 2013).