Sync'd branch integration/inbound with upstream @ Sun Nov  9 20:14:54 PST 2014