Merge branch 'master' of pivot.cs.unb.ca:pub/nmbug