Richard Opalka
committed
on 20 Aug 12
sync with AS7 upstream