Merging in jharley's customizations