Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 30 10:47:43 PDT 2014