Commit 4.2 (Major Bug Fixes)