Sync'd branch integration/inbound with upstream @ Tue Nov 11 19:17:52 PST 2014