Sync'd branch releases/aurora with upstream @ Sat Sep 20 03:17:31 PDT 2014