Sync'd branch integration/inbound with upstream @ Tue Nov  4 00:51:38 PST 2014