Sync'd branch integration/inbound with upstream @ Fri Oct 31 01:34:43 PDT 2014