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