Resolves #28 (merge of 4798a3f, 3.0-unstable).