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