Sync'd branch integration/inbound with upstream @ Fri Oct 31 04:03:42 PDT 2014