Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 21 00:18:45 PDT 2014