Merge branch 'master' into next

* master:
  Use maint branch of bdlib to fix build. C++11 is not required yet