Sync'd branch integration/inbound with upstream @ Sun Nov  2 14:48:37 PST 2014