Refs #21 - Merged with version 3.6-SNAPSHOT (googlecode trunk)