Fixed some bugs not present at last push time. See previous commit message.
Merge branch 'master' of https://github.com/nicolaikruger/Oz_fra_BNDN-BSUP