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