merge in changes made on master during scala support merge