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