Sync'd branch integration/inbound with upstream @ Fri Nov  7 10:32:47 PST 2014