git-svn-id: https://svn.code.sf.net/p/snpeff/code@1161 3341ced4-5d85-40e2-8a85-8d6cb0b68e6b
Merge remote-tracking branch 'upstream'