Sync'd branch releases/aurora with upstream @ Tue Sep 23 10:30:31 PDT 2014