merge official version 2013.1.319