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