Manual merge of https://github.com/Mehanik/RTClib.git