Merge remote-tracking branch 'upstream/master'
Should fix issue #704
submitter please verify and close
Merge remote-tracking branch 'upstream/master'