Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 14 13:52:40 PDT 2014