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