Merge proposals dependent on lp://qastaging/~ps-jenkins/webapps-greasemonkey/latestsnapshot-2.3.6+13.10.20130920.1-0ubuntu1

1. latestsnapshot-2.3.6+13.10.20130920.1-0ubuntu1
2. Dependent merge proposals