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