Sync'd branch integration/inbound with upstream @ Fri Nov  7 11:41:44 PST 2014