Sync'd branch integration/inbound with upstream @ Fri Nov  7 05:59:45 PST 2014