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