Sync'd branch integration/inbound with upstream @ Fri Oct 31 13:09:32 PDT 2014