Sync'd branch integration/inbound with upstream @ Fri Oct  3 07:30:41 PDT 2014