Merge branch 'master' into mccaskey/work_on_155