Commit 5c9f30369a8a300abdcf572593786c0d808474fe

Con Kolivas 2013-10-29T22:25:05

Merge branch 'master' into hashfast