Sync'd branch integration/inbound with upstream @ Sat Nov  1 03:45:29 PDT 2014