Commit e1b4aa980ca6fafeac5933639cc38a56f29e279a

Con Kolivas 2013-10-25T14:42:35

Merge branch 'master' into hashfast