Sync'd branch releases/aurora with upstream @ Wed Sep 17 07:41:15 PDT 2014