Sync'd branch releases/aurora with upstream @ Sat Sep 13 03:18:32 PDT 2014