Sync'd branch integration/inbound with upstream @ Fri Oct 10 13:27:39 PDT 2014