Sync'd branch integration/inbound with upstream @ Sun Nov  2 19:35:44 PST 2014