i26
auto merge of #285 : barosl:i26, r=barosl