Failing to update lastActivityTime causes things to get a bit silly...
Merge remote-tracking branch 'upstream/master'