Sync'd branch releases/aurora with upstream @ Tue Sep 16 09:19:34 PDT 2014