Sync'd branch releases/aurora with upstream @ Tue Oct 28 15:27:49 PDT 2014