Commit 669bcac36ca4aa6140704e1352375500418ededb

Con Kolivas 2013-10-23T12:06:20

Merge branch 'master' into hashfast