Merge "Always close file descriptors" into pi-dev