f1e7c23
Merge remote-tracking branch 'upstream/master' * upstream/master: fix namespace, add error checking