Merge upstream20140829

Includes a fix for loading export mappings