Merge commit from inaka