merged upstream changes
Merge branch 'v2p4p0' of https://github.com/sjneph/bedops into v2p4p0