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