Merge branch 'for-next-stale-20190409' into for-next-20190409