Sync'd branch integration/inbound with upstream @ Sun Nov  2 07:42:32 PST 2014