Sync'd branch releases/aurora with upstream @ Sat Oct 25 03:23:39 PDT 2014