Commit 634151ffa023dcac8aa927e36f7f447e158f374d

Con Kolivas 2013-10-14T10:06:37

Merge branch 'master' into hashfast