flow: Merged <feature> 'scanbuild-fixes' to <develop> ('develop').
develop
2018-01-02, Gary Kramlich