Sync'd branch integration/inbound with upstream @ Sun Oct  5 14:16:41 PDT 2014