Sync with AtomJack's mainline