Sync'd branch integration/inbound with upstream @ Fri Nov  7 16:19:08 PST 2014