- upstream fixes for linux 3.13