Commit 2d67bb06dca07e77cce669e12ffe2769ed268afa

Con Kolivas 2013-10-26T16:22:13

Merge branch 'master' into hashfast