Versions/AP-408314

Update Information
Another hotfix for the Testing Branch, fixing a crash for the weekend. Have a good one!

Edit: Plus an emergency Friday afternoon hotfix hotfix! Enjoy!

Bug Fixes

 * Fix unrelated entities taking on mass when combining same elements on a cell