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