Sync'd branch releases/aurora with upstream @ Sun Sep 14 15:17:33 PDT 2014