Upstream merge of CB-1.7.8-R0.1
1.7.8 updates
Renamed siege machine to potion well