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