Fixed data-exporturl by removing slash before question mark.
Merge origin/master