Commit dad6c704206daa1539e520d0ae647c90e5a35041

Paul Sheppard 2012-11-06T09:46:05

Merge branch 'master' into error_counters