  * Merge from Roger's changeset 0.11.2

