Commit 939b8d0091ac847e39efeddb58ac1817bbaf317b

Con Kolivas 2013-10-22T17:18:42

Merge branch 'master' into hashfast