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