Re-Upload of 1.9.11-git-beta1-r3

Re-Upload due resolution conflicts.