Commit 4940b7198e64b542d7fa0c1608dbe9a00dae71b2

Con Kolivas 2013-10-26T22:12:34

Merge branch 'master' into hashfast