Sync'd branch releases/aurora with upstream @ Wed Sep 17 12:16:38 PDT 2014