[xubuntu] 16.04 Intel 7260 wifi stops responding after random amount of time

My laptop is a year and a half old and from the start I ran Xubuntu 14.04 with no wifi problems. I installed Xubuntu 16.04 recently and the wifi is giving me problems under it. It will coect and work correctly for a while, anywhere from a couple of minutes to, say, a half hour, but eventually it stops responding. Network manager shows it's still coected to the SSID and there are no error messages in syslog, but requests do not get through to the inteet. I let it sit for 20 minutes one time and it never came back to life. If I click on the SSID again in the network manager applet, it recoects and starts working again.

I have my system set to dual boot between 14.04 and 16.04. I went back to the 14.04 system, just to see that the network adapter wasn't going bad or something, and the wifi under 14.04 still works fine. I used it for a couple of hours with no freezes.

So far, I've tried using the iwlwifi 11n_disable=8 option, but that had no effect.