Merge pull request #2444 from oneru/nano-2.5.3