Apply Latest Vanilla Bugfixes from Master Branch (2.2.3.4 / 7-27-13)