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