Sync'd branch releases/aurora with upstream @ Sat Sep 13 01:44:00 PDT 2014