Sync'd branch integration/inbound with upstream @ Sat Nov  1 11:17:28 PDT 2014