Sync'd branch integration/inbound with upstream @ Tue Nov 11 20:22:53 PST 2014