Sync'd branch integration/inbound with upstream @ Fri Oct 31 17:41:33 PDT 2014