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