Commit f29f6121821923b23311787d258423457eac30df

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

Merge branch 'master' into hashfast