  * Merge from Roger's changeset 0.15

