Sync'd branch integration/inbound with upstream @ Fri Oct 31 11:30:37 PDT 2014