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