Commit 118f9038a0a54029fb799bbb0185cc4c5cd1eced

Con Kolivas 2013-09-22T20:18:18

Merge branch 'master' into hashfast