Sync'd branch releases/aurora with upstream @ Tue Sep 16 11:54:29 PDT 2014