Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 23 16:50:40 PDT 2014