Sync'd branch integration/inbound with upstream @ Fri Oct  3 05:29:46 PDT 2014