Sync'd branch integration/inbound with upstream @ Tue Oct  7 03:03:46 PDT 2014