final commit for aurora 2013
final aurora commit