Commit 2bbe492f5b48b928e21b8260542cf6dc0920b0dd

Con Kolivas 2013-10-15T08:45:13

Merge with master