Disable download_resources target in build.xml

Download the SWIG wrapper for the time being till we find out how to
generate it
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into patch-1