Commit a39a9c27d6e9e82f522fe8eb718b806a501c9dfe

Con Kolivas 2013-09-27T08:32:54

Merge branch 'master' into redfury