Merge https://github.com/postgres/pgadmin3
Merge branch 'master' of https://github.com/jinfroster/pgadmin3
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of https://github.com/jinfroster/pgadmin3
Fixed compile errors on Linux