Remove lop-sided oil barrels from 4c-pyramidal.
Merge branch 'bugfixes' into 3.1