Should fix namespace error.
Merge remote-tracking branch 'upstream/master'