Sync'd branch integration/inbound with upstream @ Sat Nov  8 06:42:38 PST 2014