Sync'd branch releases/aurora with upstream @ Fri Oct 10 21:17:36 PDT 2014