Sync'd branch integration/inbound with upstream @ Fri Oct 31 10:51:38 PDT 2014