Update polyhymnia from master