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