Sync'd branch integration/inbound with upstream @ Sat Nov  8 11:05:18 PST 2014