fixing missing endquote for linux server command and merging python 2.x bug fixes from master [refactoring prevented automerge]