Ndkr10

We need these changes in master for compat with the Travis updates.