Richard Opalka
committed
on 20 Aug 12
synch with AS7 upstream