Sync'd branch integration/inbound with upstream @ Fri Oct 31 10:29:40 PDT 2014