Sync'd branch releases/aurora with upstream @ Fri Oct  3 00:16:33 PDT 2014