Sync'd branch integration/inbound with upstream @ Fri Oct 24 04:55:42 PDT 2014