Merge master back into pht-frodo