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