Manual merge of pr/286 from Mike Benowit