[PATCH 0/2] recent patches backported to getopt branch