Merge potlatch_010 branch to head.