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