Sync'd branch integration/inbound with upstream @ Fri Nov  7 07:38:47 PST 2014