Rebase

Rebase from adennison/master