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