Merge remote-tracking branch 'origin/master' into fix/boost-console-feed-1596