merged in diffs fro gh pages