paulsuh/nsh — pull request #2 by paulsuh (2013-05-17 03:20:38+00:00)
Title: Update from main trunk

blag