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