Merges jefftimesten's develop branch into lwansbrough master