Imported Upstream version 0.4.1.jurko.6~git20131130
Merge tag 'upstream/0.4.1.jurko.6_git20131130'

Upstream version 0.4.1.jurko.6~git20131130
Reinstate global namespace contents.