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