The non-linear evolution of modulated waves in a boundary layer