Merge pull request #561 from luke-jr/optimize_conn_adjtime