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