Sync'd branch integration/inbound with upstream @ Fri Nov  7 18:40:42 PST 2014