Sync'd branch releases/aurora with upstream @ Tue Sep 16 06:57:36 PDT 2014