We give a simplified definition of topological T-duality that applies to arbitrary torus bundles. The new definition does not involve Chern classes or spectral sequences, only gerbes and morphisms between them. All the familiar topological conditions for T-duals are shown to follow. We determine necessary and sufficient conditions for existence of a T-dual in the case of affine torus bundles. This is general enough to include all principal torus bundles as well as torus bundles with arbitrary monodromy representations. We show that isomorphisms in twisted cohomology, twisted K-theory and of Courant algebroids persist in this general setting. We also give an example where twisted K-theory groups can be computed by iterating T-duality.