Sync'd branch releases/aurora with upstream @ Tue Sep 30 06:33:37 PDT 2014