Bug in print_cookies if cookie_jar was None
Merge remote-tracking branch 'origin/master'