Changes for release 1.5; Issue #25