20130429 only upstream changes