Resolve merge conflicts.
Resolve merge conflicts.

chrismattmann/drat,lewismc/drat,karanjeets/drat,chrismattmann/drat,karanjeets/drat,karanjeets/drat,lewismc/drat,sfrancus/drat,lewismc/drat,lewismc/drat,sfrancus/drat,sfrancus/drat,lewismc/drat,chrismattmann/drat,sfrancus/drat,karanjeets/drat,chrismattmann/drat,sfrancus/drat,karanjeets/drat,chrismattmann/drat