Merge branch 'master' into madhusudancs/error-reporting