Commit 31e8ebaffaec734c48dd61ff2425674e906de2b4

Con Kolivas 2013-10-19T16:08:17

Merge branch 'master' into hashfast