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