Update from Erich repository

July 9, 2013