Commit 7ada258bbf9232f133869aec2642321f4fb937d3

Con Kolivas 2012-07-03T11:04:44

Merge branch 'master' into bfl