- Merged in changes from offical 1.4.1 branch into our fork