Sync'd branch integration/inbound with upstream @ Mon Nov  3 13:28:45 PST 2014