Sync'd branch integration/inbound with upstream @ Tue Oct  7 12:28:45 PDT 2014