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