Should fixes from https://launchpad.net/timekpr-revived/trunk be merged into here?
Should fixes from https://launchpad.net/timekpr-revived/trunk be merged into here?