Add a column specifying "Location"
Merge branch 'master' into debian
New upstream release: Add a column (user request)

* New upstream release: Add a column (user request)
* Standards-version 3.9.2 → 3.9.5 (no changes needed)