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