Merge bnoguchi:master in wercker:master