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