Sync'd branch releases/aurora with upstream @ Sat Oct 11 03:22:36 PDT 2014