ZeroAccess 16470 10/25/2013
Merge pull request #2 from dmaynor/master

ZeroAccess 16470 10/25/2013