switch 4.00.1+short-types to a more stable version of the patch
Merge pull request #376 from mirage/master

fix 4.00.1 switch for short types