Intermediate commit for OBSTOOLS directory changes from dev_merge_2015 so I can sort file type changes