Jfs merge 20140728

Promoter's version now released.