Merge "Don\'t redefine B_PACK_CHARS" am: 478259b574
am: e9ddb0d00d

* commit 'e9ddb0d00d935ed64a78bc212197ca84b090be13':
  Don't redefine B_PACK_CHARS