Sync'd branch integration/inbound with upstream @ Tue Oct  7 06:34:42 PDT 2014