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