Sync'd branch releases/aurora with upstream @ Tue Oct 28 23:28:33 PDT 2014