Sync'd branch integration/inbound with upstream @ Wed Nov  5 16:40:03 PST 2014