Merge JakeWharton/master