Merge pull request #4286 from hnyman/nano281