Fix bed rendering issue. #875
Merge remote-tracking branch 'origin/master'