#650
Merge pull request #671 from AlexDag/650

#671: pull request #650
Merge remote-tracking branch 'upstream/master'