Sync'd branch integration/inbound with upstream @ Sun Nov  2 08:49:33 PST 2014