Merge remote-tracking branch 'l-mr1-release' into rel-st8-l-partner rel-st8-l-r4-partner rel-st8-l-r5-partner rel-st8-l-r6-partner rel-st8-l-r7-partner
Roger Ma [Tue, 24 Mar 2015 06:28:27 +0000 (14:28 +0800)]

Trivial merge