pull fixes for #33
Source for buildrump.sh git rev a53047d747dfd6d7d9a25b9d246cf2ea52cc5c63