20130929-merge