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