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