Merge upstream 2014 07 14

Just tracking upstream changes. There are some fixes to the dataImporter and also the object use history bundle.