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