Merge commit '2651352988212531038326c44754ece1728c4a3b'
authorMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 21:23:50 +0000 (21:23 +0000)
committerMark Thompson <sw@jkqxz.net>
Wed, 21 Feb 2018 21:23:50 +0000 (21:23 +0000)
* commit '2651352988212531038326c44754ece1728c4a3b':
  cbs: Allocate the context inside the init function

This commit is a noop, see 6734eef6b8b464139fdc140ec9bc9e8d74173869

Merged-by: Mark Thompson <sw@jkqxz.net>

Trivial merge