Merge from CommunityJSData master