Merge of r85:88 from branch polarssl into trunk.