Fix non-rendering of some objects (buttons, fences) .. sort of.
Merge remote-tracking branch 'origin/master'