Secondary and tertiary ordering in non-stoichiometric YBa2Cu3O6 δ