Changes to collapse into a singe namespace (bug#88)

jethanandanirequested to merge
namespace into master

Merge request reports