315_java_5 - merge issue
315_java_5 - merge issue

Change log was not updated correctly during the merge. Cleaned up manually.
bradyhouse/house,bradyhouse/house,bradyhouse/house,bradyhouse/house,bradyhouse/house,bradyhouse/house,bradyhouse/house,bradyhouse/house,bradyhouse/house