Merge branch '10.x'
Merge branch '10.x'
Merge branch '10.x'
Merge branch '10.x'
Merge branch '10.x'
Merge branch '10.x'
Merge branch '10.x'
Merge branch '10.x'
Merge branch '10.x'
Merge branch '10.x'
Merge branch '10.x'
Merge branch '10.x'
Merge branch '10.x'
Merge branch '10.x'
Merge branch '10.x'
Merge branch '10.x'
Merge branch '11.x'
Merge branch '11.x'
Merge branch '11.x'
Fix multiple serious bugs in factory placement code.