Merge ID fixes from https://github.com/pelzrutsche/ActiveAndroid/commit/e3d5c2d8471943ca48ff68cb1ad0810485c19c22