Merge branch '0.6.13'
am: b027b17e08

Change-Id: Id20b104414b59ad4f2381980cc2a81a927aed46c