Sync'd branch releases/aurora with upstream @ Wed Sep 24 17:56:33 PDT 2014