Sync'd branch releases/aurora with upstream @ Sat Oct 25 21:21:53 PDT 2014