Sync'd branch releases/aurora with upstream @ Tue Sep 30 17:17:36 PDT 2014