Merge pull request #1265 from totten/master-bb-ismodified