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