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