fixing failures
BZ comment
changes for merging
Merge remote branch 'upstream/master' into sam-fixes
updating the bz comment format
Merge pull request #655 from ab268/sam-fixes

fixing failures