Merge master and rebuild.