Sync'd branch releases/aurora with upstream @ Mon Sep 15 09:56:32 PDT 2014