20140110, L-SMASH now included upstream