Nano: Update to 2.6.3, backport patch from trunk to fix compile