Added changes made to local copy for 0.6.9 release to PPA