Incorporate fixes from the Debian master branch

* Switch to Trusty to have django 1.6