Sync'd branch releases/aurora with upstream @ Tue Sep 16 05:48:32 PDT 2014