Sync'd branch integration/inbound with upstream @ Tue Oct  7 20:35:42 PDT 2014