0.2 #15 - fix issue of URI space encoding (backport)
Merge remote-tracking branch 'origin/0.2' into 0.2