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