Merge branch 'master', remote branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix issue #731
Merge pull request #732 from jacquerie/issue-731

Issue 731