Sync'd branch releases/aurora with upstream @ Sat Sep 27 18:23:30 PDT 2014