Merge pull request #2705 from jediluke69/bleeding-edge-freeze

less robusty nanopaste