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