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