fix bug 1351
Merge remote-tracking branch 'origin/master'