Commit b639e688706708972cc08bd9ee46a76ce15263a9

Con Kolivas 2013-10-24T21:19:29

Merge branch 'master' into hashfast