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