Sync'd branch integration/inbound with upstream @ Sun Oct 26 11:11:42 PDT 2014