Commit d2d7a7468e90ecbd37eeabd9399880d929d78767

Con Kolivas 2013-10-14T00:54:39

Merge branch 'master' into hashfast