Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 16 14:20:09 PDT 2014