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