Auto merge of #289 - barosl:j1, r=barosl