Merge commit '7cb1d9e2'

* commit '7cb1d9e2':
  build: Fine-grained link-time dependency settings

Also included are bug fix commits 5ff3b5ca,
d9da7151 and
5e27ef80.

Merged-by: James Almer <jamrial@gmail.com>