Merge remote-tracking branch 'remotes/origin/bug_599_picload_fd_leak'