Sync'd branch releases/aurora with upstream @ Sat Oct 11 09:47:37 PDT 2014