Switched to new apt repository
rebased with upstream master.