Sync'd branch integration/inbound with upstream @ Sat Nov  1 19:46:31 PDT 2014