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