Sync'd branch integration/b2g-inbound with upstream @ Mon Sep 22 01:38:39 PDT 2014