Update Hgpovray with changes from master