e27
auto merge of #116 : barosl/test-1/e27, r=barosl