v20140705 (fixes #204)