Merge "Implement equals() and hashCode() like a good little object." into jb-mr1-dev