NPC-229 Merge in changes from master branch on numenta/nupic before buil...

...ding.